Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Sep 2011 15:06:30 +0000 (08:06 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Sep 2011 15:06:30 +0000 (08:06 -0700)

Trivial merge